added babl-classes to the installed headers

diff --git a/ChangeLog b/ChangeLog
index b2cbc66d5271f5ebfb419499b393379d0603049b..f9d94d386a30125d0c411bcecea6e28841f65d1d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-06-02  Øyvind Kolås  <pippin@gimp.org>
+
+       I'm not entirely sure about installing babl-classes.h like this, it
+       might make more sense to create setters/getters to be used. Thus
+       making it possible to extend the structs at a later stage without breaking
+       binary compatibility.
+
+       * babl/Makefile.am: Added babl-classes.h to the installed headers
+       * babl/babl-classes.h: Made the magic number fit in 32bit int.
+       * babl/babl.h: include babl-classes.h
+
 2006-02-22  Øyvind Kolås  <pippin@gimp.org>
 
        * docs/index-static.html.in: added a link to the DHTML version of the

diff --git a/babl/Makefile.am b/babl/Makefile.am
index dccccabdb6f0941279467d55e9e65b822c69c324..ffc0338f2011cd4f83d6609a52aea213e08b0541 100644 (file)
--- a/babl/Makefile.am
+++ b/babl/Makefile.am
@@ -41,7 +41,8 @@ h_sources  =                          \
 
 library_includedir=$(includedir)/babl-$(BABL_API_VERSION)/babl
 library_include_HEADERS =              \
-       babl.h
+       babl.h                          \
+        babl-classes.h
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/babl/base
 

diff --git a/babl/babl-classes.h b/babl/babl-classes.h
index 63ed19e15492d5b612cf65ac7934f2ec16ae92b1..24ca3db55979b0940f4739e8e376616ac14ecc3e 100644 (file)
--- a/babl/babl-classes.h
+++ b/babl/babl-classes.h
@@ -47,7 +47,7 @@ typedef long (*BablFuncPlanar)    (int    src_bands,
  * differentiation in polymorphic functions. (as well as manual
  * type check assertions).
  */
-#define BABL_MAGIC   0xbAb10000
+#define BABL_MAGIC   0xbAb100
 
 typedef enum {
   BABL_INSTANCE = BABL_MAGIC,
@@ -219,7 +219,9 @@ typedef struct
   BablConversion  *conversion;
 } BablFishSimple;
 
-
+#ifndef BABL_HARD_MAX_PATH_LENGTH
+#define BABL_HARD_MAX_PATH_LENGTH 16
+#endif
 
 /* BablFishPath is a combination of registered conversions, both
  * from the reference types / model conversions, and optimized format to
@@ -236,8 +238,8 @@ typedef struct
   double           cost;   /* number of  ticks *10 + chain_length */
   double           loss;   /* error introduced */
 
-  BablConversion  *conversion[BABL_HARD_MAX_PATH_LENGTH];
   int              conversions;
+  BablConversion  *conversion[BABL_HARD_MAX_PATH_LENGTH];
 } BablFishPath;
 
 /* BablFishReference 

diff --git a/babl/babl.h b/babl/babl.h
index ebedf68ca7b5688df8f6b8b731777319c0adc178..92fc330bc4fbc06cc2056f4352d8b262986c3a6b 100644 (file)
--- a/babl/babl.h
+++ b/babl/babl.h
@@ -25,6 +25,7 @@
 #ifndef _BABL_H
 #define _BABL_H
 
+#include "babl-classes.h"
 #ifdef _BABL_INTERNAL_H
 #error babl.h included after babl-internal.h
 #endif